--- /dev/null
- 7eaf227281e7c35cd09405ef3f94a4eeced22882
- 7eaf227281e7c35cd09405ef3f94a4eeced22882
+# see git-dpm(1) from git-dpm package
++07daa825f4a4af9e269ace4071b86e6528412619
++07daa825f4a4af9e269ace4071b86e6528412619
+7aee3de6fd6bca44751754b10a338947fa947b1c
+7aee3de6fd6bca44751754b10a338947fa947b1c
+emacs23_23.3+1.orig.tar.bz2
+80b3822579eddfc120641c5a181eb0b5c7a0667d
+23065394
--- /dev/null
- From c58e9cd9eb3d4b49b97548cd9986743bcc9a9370 Mon Sep 17 00:00:00 2001
++From cc4f64d8930553f0b84ec613f626f5317df303ab Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Wed, 6 Apr 2011 21:44:42 -0500
+Subject: Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure.
+
+The build should no longer fail when linking with --no-add-needed
+
+Previously, configure would clear FONTCONFIG_LIBS and
+FONTCONFIG_CFLAGS. This would break the build when compiling with a
+linker that defaults to --no-add-needed. For example:
+
+ /usr/bin/ld: ftfont.o: undefined reference to symbol 'FcInit'
+
+configure should no longer clear these variables.
+
- Author: Reinhard Tartler <siretart@tauware.de>
++Author: Matthias Klose <doko@ubuntu.com>
++Date: Mon, 28 Feb 2011 01:02:41 +0100
+Added-by: Rob Browning <rlb@defaultvalue.org>
++Closes: #554324
+---
+ configure.in | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index baacfe4..0639715 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2044,11 +2044,7 @@ if test "${HAVE_X11}" = "yes"; then
+ ## We used to allow building with FreeType and without Xft.
+ ## However, the ftx font backend driver is not in good shape.
+ if test "${HAVE_XFT}" = "yes"; then
+- dnl As we use Xft, we anyway use freetype.
+- dnl There's no need for additional CFLAGS and LIBS.
+ HAVE_FREETYPE=yes
+- FONTCONFIG_CFLAGS=
+- FONTCONFIG_LIBS=
+ fi
+
+ HAVE_LIBOTF=no
+--
+1.7.4.1
+
--- /dev/null
- From cba6a1f885d1e357fa92d36312dbc760b507082f Mon Sep 17 00:00:00 2001
++From 136cc18a735081b12da58fbcfec5092fe8e7826d Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Fri, 8 Apr 2011 22:50:51 -0500
+Subject: Fix a tty-related preprocessor inclusion error affecting GNU/Hurd systems.
+
+A problem with the preprocessor defines in src/term.c has been fixed.
+This problem would cause Emacs to fail on GNU/Hurd systems as follows:
+
+ $ emacs -nw
+ emacs: Not a tty device: /dev/tty
+
+Author: Samuel Thibault <sthibault@debian.org>
+Date: Thu, 20 Jan 2011 02:17:24 +0100
+Applied-By: Rob Browning <rlb@defaultvalue.org>
+Forwarded: bug-gnu-emacs@gnu.org
+Closes: #610576
+---
+ src/term.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/term.c b/src/term.c
+index 6d16a65..44e127e 100644
+--- a/src/term.c
++++ b/src/term.c
+@@ -3413,13 +3413,12 @@ init_tty (char *name, char *terminal_type, int must_succeed)
+ if we don't have one at the moment. */
+ fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0);
+ else
+-#else
++#endif /* O_IGNORE_CTTY */
+ /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only
+ defined on Hurd. On other systems, we need to explicitly
+ dissociate ourselves from the controlling tty when we want to
+ open a frame on the same terminal. */
+ fd = emacs_open (name, O_RDWR | O_NOCTTY, 0);
+-#endif /* O_IGNORE_CTTY */
+
+ tty->name = xstrdup (name);
+ terminal->name = xstrdup (name);
+--
+1.7.4.1
+
--- /dev/null
- From 7eaf227281e7c35cd09405ef3f94a4eeced22882 Mon Sep 17 00:00:00 2001
++From 07daa825f4a4af9e269ace4071b86e6528412619 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 10 Apr 2011 10:03:45 -0500
+Subject: Expect 0 from kill() for zombies on GNU/Hurd.
+
+Emacs should no longer hang while waiting for child processes on GNU/Hurd.
+
+Author: Samuel Thibault <sthibault@debian.org>
+Date: Mon, 31 Jan 2011 01:13:35 +0100
+Applied-By: Rob Browning <rlb@defaultvalue.org>
+Forwarded: bug-gnu-emacs@gnu.org
+Closes: #611591
+---
+ src/sysdep.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/sysdep.c b/src/sysdep.c
+index 1fbc061..3abb43f 100644
+--- a/src/sysdep.c
++++ b/src/sysdep.c
+@@ -411,7 +411,7 @@ wait_for_termination (pid)
+ while (1)
+ {
+ #ifdef subprocesses
+-#if defined (BSD_SYSTEM) || defined (HPUX)
++#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__)
+ /* Note that kill returns -1 even if the process is just a zombie now.
+ But inevitably a SIGCHLD interrupt should be generated
+ and child_sig will do wait3 and make the process go away. */
+--
+1.7.4.1
+
projects / emacs.git / commitdiff